Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crop extension #1666

Merged
merged 28 commits into from
Oct 27, 2016
Merged

Crop extension #1666

merged 28 commits into from
Oct 27, 2016

Conversation

KevinRansom
Copy link
Member

@KevinRansom KevinRansom commented Oct 26, 2016

Update for cropextension to reduce the number of times it calls validate path character.

Also contains revert nunit.consolerunner to 3.0.0

dsyme and others added 28 commits October 14, 2016 10:25
* Add fsx files to workspaces

* Stop passing project output paths to CPS

* Read script file contents from memory (on workspace initialization)
* cleanup build and test scripts
@KevinRansom
Copy link
Member Author

@dotnet-bot test this please

@forki
Copy link
Contributor

forki commented Oct 27, 2016

This doesn't look correct - something seems wrong with your git repo. I assume you should rebase this on origin/master and hard rest your master on origin/master

@dsyme
Copy link
Contributor

dsyme commented Oct 27, 2016

@forki - see #1631

@forki
Copy link
Contributor

forki commented Oct 27, 2016

Yes but without proper rebase and hard resets they will always come back...

@dsyme
Copy link
Contributor

dsyme commented Oct 27, 2016

@forki Yes. Though it's not that bad - the use of squash-and-merge means that they don't enter the commit history (though they keep appearing in the squash-merge messages unless they get edited out)

@forki
Copy link
Contributor

forki commented Oct 27, 2016

True squashing is a way to keep these hashes out. But I vote to require everyone to fix up their history in order to have proper diff here on github. It's just super hard to review with broken history.

@dsyme
Copy link
Contributor

dsyme commented Oct 27, 2016

approved (with squash :) )

@KevinRansom KevinRansom merged commit 8b3540e into dotnet:master Oct 27, 2016
@KevinRansom KevinRansom deleted the cropextension branch October 27, 2016 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants